[PATCH] QIconLoader: Don't consider fallbackThemeName() in themeName()

themeName and fallbackThemeName are independent things.

bebbf84167a4341eed27ecfca480ff62dfa1b159 mixes the two together,
which results in setFallbackThemeName() incorrectly changing
themeName().

Restore that part to how it was before.

Amends bebbf84167a4341eed27ecfca480ff62dfa1b159

Fixes: QTBUG-149431
Change-Id: I7bb5e4329b677abb95b74269877f8d9c0222a972
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 85420d5d4f78a6ba4cf70ed8ee092e0ef4fb9a54)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit e80e3f0cebae9c3a45a1b7ce81d6454c699d89c6)

Gbp-Pq: Name upstream_444b479_dont_consider_fallbackthemename_in_themename.diff

diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index 62353ec9cd9281f41d9da49054cea2506f179aef..4526c6f75fb3884de4f3374526adaf4c1559961a 100644 (file)
--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@@ -151,8 +151,7 @@ QString QIconLoader::themeName() const
         return m_userTheme;
 
     if (m_systemTheme.isEmpty()) {
-        const QString &themeName = systemThemeName();
-        m_systemTheme = !themeName.isEmpty() ? themeName : fallbackThemeName();
+        m_systemTheme = systemThemeName();
     }
     return m_systemTheme;
 }